Fixed more issues.
Fixed more issues.