Fix issues with first deployment