fix plugin issues