Fix issues encountered in Xcode 5.