Warning fixes for Xcode 4.6