Fixed some more issues.