Fixes according to pull request feedback.