More regression fixes