Hot interface fixes.