Fixes required for syntax check