STL Bugs fixed