Callback fixes.