Updates for Cabal 1.18 and Haskell2010