Making the plugins less broken.