Tweak ciper messages - closes #905