ENV vars and DB fixes