Fix Xcode 6.1-era issues with templates