Fixed some lambas/scopes wrt. order