REGRESSION: Fix issues found by by review