More adjustments related with x64 issue;