fixing bugs on android