XCode 6.1 fixes