Fixed up cabal stuff