Fix issues from jenkins