More... debug fixes