Fix issues with each deprecation