minor fixes for message keys