Hopefully fix some of the data liberation encoding issues