Small interface fixes.