fix files and env vars