fixes for api change