jenkins_integration: more small bug cleanup