Fix stringtable issues