More fixings for the toro RIL bug.