Fixed plugin issues