Minor changes to make project work as expected using Xcode 5-6.