Fix cabal and convertible deps