more filepath fixes