Some minor changes relating to noise