Fix some env variable processing