Fix some callbacks