callback fixes