Fix env issues