more fixes for android