Addressing Leakage in Concept Bottleneck Models