Fix callbacks