more anonymous function fixes