Fix issues related to package archiving