More fixes for the new callback system.