fixes for b2g