Bugfix for adding a null length path at start, plus reformat.