More lambda/proc problems fixed