Fixed some flaws from the last chat version