Changes to make it work in old Xcode