fix a number of deprecations

This small series of commits fixes a number of deprecations that I've found cluttering build results in Builder making it harder to find legitimate issues.