WIP: some fixes for noise compensation