Some interface fix