Some cabal fixes