Fixed problems with message keys