More debris changes