Update to work with latest Cabal head