waveney-suggested fixes