Changed some Android related things