various regression fixes