Fix callback errors