Resolved unit conversion warnings for 64 bit