Cleanup some code errors
Fix cocoapods support