Fixes for ios