Fix 64bit operations

Change-Id: I78c2f2d8db4f61b416e6977861263a122235b88a