some improvements regarding xcode 6