Fixes by PR comments
Merge pull request #57 from lensky84/11548_fixes

Fixes by PR comments