Fixed local env issues with environment vars