couple small fixes on android