Minor CB changes