some env fixes