Changes to hopefully have Xcode 4 and Xcode 5 co-exist