Fixing some problems detected on code review.