Changes to get Android functioning.