Add a few more places where we need to pass the full path to the file being parsed