Small improvements
Merge pull request #1186 from ussuri/small-fixes

Small improvements