Fixes for xcode 6.1