fixed some minor issues on android