More DOD tweaking