Laundry list of issue fixes

Commits have all the fun details