fixes to make Android run