callbacks do not need to be exported
Improve diagnostics