Fixing more messages...