Fixes to external callbacks.