Various cosmetic fixes
Merge pull request #2248 from vlakoff/develop

Various cosmetic fixes