Api small fixes

Some small updates on the API.