Fix up message handlers