Settle team issues