Tweaks on file paths