Fix a few orb crashes