And little more fixes
Merge pull request #4916 from Intercross21/master

And another hotfix for #4908