Minor fixes reported by Mark
Merge pull request #363 from sbesson/rebased/develop/jenkins_tiny_fix

Minor fixes reported by Mark (rebased onto develop)