Filepath tweaks