Callback fixes and improvements