Fix the last of the deprecation warnings, should build clean.