Solved additional issues according to Jenkins