Further fixes attempted for moving from absolute paths to relative paths.