Fixes related to callbacks