Cleaned up some deprecation warnings