Fix callbacks of all sorts