More BIT_ROM fixes for esp