fix callback return type in a few places.