Merge "Fixed two 64-bit porting issues; Make pid/tid type consistent"