Fixed a few tiobe warnings.