Fix some issues reported by Travix
Merge branch 'master' of https://github.com/Kooboo/CMS