changes for compiling with XCode 6.1