Fix a few more synchronous callbacks that slipped through the cracks.