Fixes xcode 6.1 issues