Minor fixes
Merge pull request #3014 from vlakoff/various

Various fixes