Latest changes, mostly for Jenkins