some minor fixes (association)