Made Xcode 6 happy, left comments in for 6.1