Fixing iOS build
Merge pull request #366 from stopiccot/ios_fixes

Fixing iOS build