Escape* and UnescapeCharacter no longer private
Fix for Menu
data fix