End some corrections of old code