Minor update to debug traces and preparation for new subsystem