Fix shipping calculator messages

PR for #5323