Some minor updates to decode.