Minor changes to try to fix android