Correcting a few argument types in callbacks.