Tweaks to decoders