Add some more debug to the by-obj mapper