Fix some android bugs

In Progress