Issue resolutions, cleanups and tweaks

- #2206, #2362, #2360, #2252, #2359
- Misc cleanups and tweaks (see commit log)