Fixes to Windows Cross build