minor improves
fixed android build