64 bit portability improved