fixes for xcode5