More haddock updates.