More fixes for using more than 64 bits