Reformat. Fixes #582
More path fixes