Message fixes

Addresses #715 and #717