Few more fixes/ improvements to jenkins build.