Fixing up the encoding endpoints