Fix for entity spawning in general