more changes for STL merge