Several fixes in API and defaults