Syntax fixes from testing