Minor android specific bug fixes