More fixes on Toad.