fixes to feature b2g