Noise fixes