Jenkins fixes and formatting