Fix tools trying to spawn the wrong entities