Couple more bits of Eco cleanup