ios template compiles OK
Merge pull request #5288 from ricardoquesada/template_fixes

ios template compiles OK