Small android improvements