More debug fixing