Android fix + other stuff