Fixing all of my plugins