Fix decoders. Specs pass.