Fix Xcode issues