Small adjustments and fixes on modifications to 64 bit