Fix missing headers in cabal download
Add a few more smart constructors