More fixes with debug