Fix some returns from reviews.