Solving more issues