Fixups for B2G support regressions.