Misc minor fixes in packaging step.