minor regression fixes