Patch:Base TSA/Fixes for hardcoded strings