Adding noise fix and utils tweaks