Intelli-plug fixups