Fixed environment vars