Fix some association