Some interface fixes.