fixes for xcode 6.1