FS-5588 --resolve windows compiler fixes