Minor API adaptions