Fixes by MitkoK for other places
Merge pull request #1 from pavel-so/master

Fixes by MitkoK for other places