Fixed last known remaining 64 bit issues.