Fixes for android build