More file location fixing