Various interface fixes