Better FS path generation