Minor usability fixes
Merge pull request #21 from Mirantis/feature

Minor usability fixes