Minor fixes to the interfaces