small fixes to set_message etc