Small Interface fixes