Fixes some more issues.