Add fixes for jenkins builders