windows: fix issues with code drift
windows: fix some compilation issues