afterreview fixes