Fix other lambdas