Fixed assorted NOISE bugs