debuginfo: Fixed a few things for PR.