Fix done callbacks