Filepath fixes