More plugin namespace fixes