Make things more android friendly