fix problems arisen from xcode update