Some trivial fixes to Decoder.