Fixes

Corrected the errors that showed up when I upgraded to Xcode beta 4