Plugin instance fixes