Trail and spawning fixes