Merge pull request #1 from rleigh-codelibre/outstanding-fixes

Apply outstanding fixes