More Jenkins fixes
Merge pull request #43 from chuckdumont/master

More Jenkins failurs