more fixes for API structure changes