Merge "Fix pointer size mismatch"