Orb and spawn fixes