Fixing packaging issues