Fixes some callback problems.