Fix and improve noise map functions