Thread safe fixes
Draw targets only by opencv
Small pre-merge changes