Fix reviews Closes #2378.