Fixes for CLUT decoding