[12373] Compile fixes for Windows specific corrections.

(based on commit [12264] - 3f1e3ce)