Fixed some messages