Intelli-plug fixups and derp-fix