Minor fixes reported by Mark
Merge pull request #357 from sbesson/jenkins_tiny_fix

Minor fixes reported by Mark