fix bugs for XCode 6.1