fix a few more android things