Simplify and allow failures for some env