Minor fixes
Merge pull request #85 from JetBrains/fixes

Minor fixes