Fixing paths to use user var