Merge pull request #2 from rleigh-codelibre/outstanding-fixes2

Apply outstanding fixes, part 2