Some Fixes for Xcode 6