*8212* Review tweaks