Merge pull request #532 from michael-k/small-fixes

Small fixes