Add in expandvars to path normalization.