- Update common to fix spawn logic problems