fixed some plugin issues