Android tasks fixes