Fixed minor stuff found in code-review.