Updating code to work with Xcode 6.1 release