Resolve some warnings for Xcode 4.6