Changes to compile on android