more callback fixes