Some interface fixes