Correctly require string monkey patch, tweak other code