minor fixes for refactoring deferred callbacks