fix a bunch of callbacks