Invalidation fixes