Beta fixes 1
Merge pull request #1075 from waveney/wav29

Beta fixes 1