[FIX] Minor corrections to the API.