Regression fixes. Automated editing is error-prone :-P