Changes to get it to build for iOS7