Fixes for android build breakage