Updated to remove 64bit warnings