Fix some small bugs with the interface.