609 - Windows issues PR follow up