Header and STL fixes.