fixes to callback capture