Haddock/version bound fixes