Fix message definitions for phase2