fix BASE_CONTAINER spawning by itself & on_use typo
more resolvers cleanup