Slew of updates to squash deprecation warnings