Some minor interface fixes