Minor fix on make_messages