A few more tweaks to ensure the package can be published