Minor fixes to avoid using invalid debugloc.