More plugin shenanigans