Cat's review fixes.