Fix Haddocks