Some corrections as described in my comments on #118