64 bit Compatiblity

Change-Id: Ia0951cc48d71d2835e2ec21f99b737f9acfe6d4d