More fixes to a number of things.