Last merge broke some android things, now fixed