Fixed noise issues