some minor API changes, because sanity