Add missing env wraps.