More tweaks to the FilePath code