Fixes for recent decor/Invalidating changes, fixes #185.