Small fixes for android build (WIP)