Addressing further warnings from jenkins