Minor changes to get this to build with xcode 5.