Win64 remove warnings

Remove win64 warnings, see review #480