syntactic fixes