Smallish interface fixes