Update to allow env vars in local paths