Updates to work with Xcode 6.1