More debug tweaks.