fixed some issues on android