Small fixes due to code review.