use tbb name space explicitly
fix more build issues