* Various fixes according to pull request review.