minor fix map functions to lambda