making fixes on extension