Fix production diagnostic messages

Resolves #1039