and still more breakage fixing