Fixing packaging and settings