Fixes for android channel