Fixes to make the android backend compile again