Small fix and api