Syntax fixes and a couple tests.