Fixed user and user_friendships models