Fixed a few issues with plugins and server versions.
Fixed problem in the configuration file.
Merge branch 'ent'