[PD] Small vanilla suggestions (windows)