I fixed more issues.