A few 64bit fixes.

Change-Id: I1fe189d638b9cb5127b897da6cecdad6902db930
4 files changed