Tiny changes to callback handling