A few more review fixes