debuginfo: Fixed some merge fallout