Yet another part of review fixes.