Fix Windows 64 bit warnings
Fix merge screwup
Merge pull request #874 from DonLakeFlyer/64BitWarnings2

Fix Windows 64 bit warnings