Fixed minor threading issues in MOS/TIS