Fix JENKINS-18035
Fix warnings