Fixup for issues with debug.