More fixes related to the reviews