jenkins_integration: cleaning up small bugs