Some files were no longer compiling after the NSLog cleanup

Done in second checkin