further android setup fixes