Ts 3006 fix regression

Fix RHEL5 build errors.
Fix a documentation typo.