Small fixes to interface