MakeCallback fixes