Minor fixes/tweaks (some to reduce drift wiih master branch)
6 files changed