Fixing problems reported by issue #10