Fix circular deps with Lambda -> Environment -> Lamba