Switch to the fixed Cabal branch in CI and add a fix for Natural (#640)