Decoding Fixes