Minor changes to interface.