Fix Lots of Callback Support