some fixes to tbs servers