Minor changes in CritterWaveBuilder