Minor API refacturings