FixCharacters cleaned up