Fixed exporting env vars