More Fix-ups and a couple of new pick-ups...