fix bugs in xcode61