more regression fixes