Fixed jenkins issues