Few more fixes in closures.