Changes for Cabal-1.21.1