Fix some bugs with ColorWave