Minor plugin tweaks