Fixes callback bugs.