Minor fixes / Removed deprecated STL_Lock (W-I-P, Testing)