Changed handling of cabal.