Fixed issues that prevented things from compiling with Xcode 5.1