more b2g fixes.