Fix non-entity containers (entities are still broken)