More codebook syntax fixes