Fixing some problems with the android build