Fixed more issues.