Fixed Message errors