Tagged #Android bug fixes