Small bugfixes.
Merge branch '1710' of https://github.com/ForgeEssentials/ForgeEssentialsMain into develop