Small API changes to better reflect reality