Safari/iOS fixes
Merge branch 'dev'