Two Rob micro bugs and a tidy up
For those who like completness
Merge pull request #467 from waveney/wav16

Couple of small fixes