Minor changes towards jenkins compatibility