Fix stl types