Many miscellaneous fixes

git-svn-id: https://farcry.jira.com/svn/FC/trunk@12655 8f7d33b6-1012-0410-9a5a-bb7ecce9c363
Thread check fix

git-svn-id: https://farcry.jira.com/svn/FC/trunk@12656 8f7d33b6-1012-0410-9a5a-bb7ecce9c363