plugin final fixes