Fixes for syntax inconsistencies