Fix closure warns and bug

2 commits x 1 LoC = 2 LoC's. That's a change from my recent PRs, isn't it?