Fixes for Xcode 6