Some Decoding Fixes