Enhance debug infos