fixes for Xcode 6.1