Some path changes to hopefully make generating reports stable.