Fix various small bugs in new_eff that were failing to handle window

Fix various small bugs in new_eff that were failing to handle window #2521