Fixes for breaking objective-c syntax definitions and other stuff