Fixing remaining installation issues.