Fixed two data family bugs