Made things a little more compatible with other plugins.