Got rid of a ton of deprecation warnings.