Fixed cabal issues