Minor syntactic fixes