Fixes for couplings