Fixes for NGINX setup and for additiona ENV variables