noise bug fixes