Updates to make the package installable again