fixes for android build