Two minor style update.
Removed TGF related compilation warnings.
Removed more compiler warning.