Bugfixes in Filepath