Xcode 8 beta 6 build error fixes.

Authored by featherless on Aug 19 2016, 12:31 PM.