More fixes to broken autotoys.