Fixes for Xcode 6.1.1