Fixes for android testing