make test_util pass under x64
fix remaining compilation warnings under x64
add line missing in r8504