Fix for env. variables and config