Solve mistakes