Issue #441
Issue #440
Merge pull request #442 from waveney/wav11

Couple of small fixes (one is wrong)