Interface fixes