More small fixes
Lets call this 3.5
Merge pull request #1084 from waveney/wav29

Version 3.5