Update specs and fix FM-1361