Little changes to adapt to Jenkins