* fix message format issues