More regression fixes.