Fixing message refs: #443