More fixes than I can mention