fix message types