Quick PR to fix some lingering bugs with operations on custom field associations. See commits for more info