Fixes to Cavities and couplings with Cavities