Fix up done callbacks: wrap in a function()