Syntax cleanup
Fix syntax and cleanup build errors/warnings