Little cabal improvements