Small fixes to the interface and moctracker