Fixes for Xcode 5