Fix errors missed with ENV var set in local env :/