Fixed issues seen when running against updated public API
Merge pull request #120 from gavincornwell/master

Fix issues seen when running against updated public APIs