review-based fixes