Update references so we can compile on Release 17.0