Initial import
Fix empty ENV vars