Small metadata fixes - expands env vars in path names.