some minor fixes based on reconstructing the association handling