Decoder tweaks