Missed a few.
Fix some callbacks. ;__;