Fixes for ENV Handling