Some syntactic fixes