Some adjustments following toolkit changes.