More Syntax Fixes