Misc plugin fixes