Fixed instances of lambda scopes mixed with deprecated order options