Further tweaks for path and input/output variable mapping