Old Xcode fixes