Final filepath fixes hopefully