Minor fixes with the interface