Fixed bugs from firstFeedback.