Solving issues in Unite