Fixed some messages not showing up right