Fix build errors after upgrading Xcode to 6.1.1