More debug tweaking