other fixes for android