a few fixes
Fix callbacks