Fixes for callbacks and more