Attempt to fix some issues with string interning