More Syntax Repairs...