Included the suggestions from cabal check