Some more fixing of editing forms