Small interface fixes