Some fixes
Merge branch 'serafim' of github.com:SerafimArts/forum