Some fixes for Mr. Jenkins' complaints.
Merge pull request #1415 from mfalesni/jenkins-fixes

Some fixes for Mr. Jenkins' complaints.