Fixes more lambda evaluation errors