More plugin tweaks