Parser filepath tweaks