Fix issues with configuration not saving