Fixed issues seen when running against updated public API