Done callback fixes.