Bugfixes for callbacks

The callbacks introduced yesterday were not getting called at the right spot. This commit will be re-tagged as 2.2.3