Solve more errors