Merge regression fixes