Interface fixes.