Intell_plug fixups