Namespace invalidation fixes