fixes for the package build