Minor tweaks to lambda