Small fixes for new users
Merge pull request #1 from samarion/topic/new-user-fixes

Small fixes for new users