Synergy fixes