api team - fixes