Some fixes for jenkins
Merge pull request #1099 from mfalesni/fixes

Some fixes for jenkins