Some API changes for future versions. (again)