fixes in API