Minor changes to paths and formatting.