Fixes for Xcode 5.1 warnings