some fixes for Android + iOS