attempt at manual fix up of a few files
2 files changed