Adding checks for STL containers.

A couple of minor fixes.