Commits to fix issues caused by update to Xcode 4.6