SCP - Assoc Agreements tweaks