small plugin improvements