Fix gcc compile errors.
Merge pull request #639 from est77/est_xxx_fix

Fix gcc compile errors.