More minor interface fixes