Fix some more issues.