Fixes up the interface