Fixing message handlers