A few fixes more
Merge branch 'master' of https://github.com/vasily-knk/chat