Made fixes for win64 native compilation