fixes to make it work nicer with swift projects and new xcode projects