Fix build after feedback.