merge 64-bit fixes from Fernando Lucas Rodriguez <fernando_lr@terra.es>