Incomplete changes to trace windows errors.