fixes for WIN32/64 build (with no errors or warnings)
fixes for WIN32/64