[FIXED JENKINS-22798] Fix method visiblilty issues