Fixed an error and a warning for Xcode 6b6