Fix issues with package