fixes for api