A few fixups to add API methods for useful things