Fix component callbacks