Try to fix env issues