fix a few places where callbacks were expected and not tested for