Fix issues seen when running against updated public APIs