Fix when there's no schema
Un-delete bootstrap