Small invalidation fixes.