Decoder improvements