Fix issue with updates
Merge branch 'version2.0'
Merge pull request #116 from ModernBB/master

Fix small issues