vchoi_fork

[svn-r13050] Purpose: Code cleanup

Description:
   Fixed several mismatched types causing daily test to fail on tg-login.

Platforms tested:
   Linux 2.6 (kagiso) - just to make sure no ill effects.
   I cannot login to tg-login3 so am going to watch for it on daily test
   tonight.