Small updates to the diffing (fixes callbacks not working in some cases)