Fixing CR feedbacks.