More noise fixes