Minimize changes from 3a385ea
Fix cabal file to pass cabal check