More codebook bugs