Minor fixes to regressions (#3702)