more fixes for Android Firefox