More tweaks for review suggestions.