Fixes
Merge pull request #1 from EugeneKostrikov/minor-fixes

Fixes