Updates to fix scavenge window to look better