Some minor plugin fixes