Codebook corrections