Str Escaping Fixes