[PD-dev] more windows compile issues