Minor changes to the public API