Fix a few warnings
Merge branch 'master' of github.com:mc-server/MCServer
Merge branch 'master' of github.com:mc-server/MCServer