Callback fixes