Fix up incorrect messages