Fixes for recent decor/Invalidating changes.