Fix compiler warnings that allude to possible future 64-bit issues.

Fix compiler warnings that allude to possible future 64-bit issues.