Fix message types to align with spec