Minor fixes to the Codebook