fixing up some api format changes