Windows: Additional trace %p and %d changes