B2G specific fixes