Fixing up callback behaviours