Fixes for generating the package