changes for b2g porting