fixes to support structure changes in API