Post review fixups.